Auto merge of #1149 - rndr:issue-1146, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 11 Jan 2015 04:36:17 +0000 (04:36 +0000)
committerbors <bors@rust-lang.org>
Sun, 11 Jan 2015 04:36:17 +0000 (04:36 +0000)
Closes #1146


Trivial merge